]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
messageTray: Remove some more dead code
authorJasper St. Pierre <jstpierre@mecheye.net>
Fri, 2 Aug 2013 03:33:56 +0000 (23:33 -0400)
committerJasper St. Pierre <jstpierre@mecheye.net>
Tue, 6 Aug 2013 14:36:36 +0000 (10:36 -0400)
It's impossible to have a clicked summary item if we have a main
notification or the tray is hidden, and has been ever since 3.6.

js/ui/messageTray.js

index 41ae340d63f42836dc071a0ef859f34379ee434b..9705fcb5def04afd4ab3b0a181d00c5fb8e19b1d 100644 (file)
@@ -2302,9 +2302,6 @@ const MessageTray = new Lang.Class({
 
         // Summary notification
         let haveClickedSummaryItem = this._clickedSummaryItem != null;
-        let summarySourceIsMainNotificationSource = (haveClickedSummaryItem && this._notification &&
-                                                     this._clickedSummaryItem.source == this._notification.source);
-        let canShowSummaryBoxPointer = this._trayState == State.SHOWN;
         // We only have sources with empty notification stacks for legacy tray icons. Currently, we never attempt
         // to show notifications for legacy tray icons, but this would be necessary if we did.
         let requestedNotificationStackIsEmpty = (haveClickedSummaryItem &&
@@ -2321,10 +2318,10 @@ const MessageTray = new Lang.Class({
                                       (wrongSummaryNotificationStack || wrongSummaryRightClickMenu));
 
         if (this._summaryBoxPointerState == State.HIDDEN) {
-            if (haveClickedSummaryItem && !summarySourceIsMainNotificationSource && canShowSummaryBoxPointer && !requestedNotificationStackIsEmpty)
+            if (haveClickedSummaryItem && !requestedNotificationStackIsEmpty)
                 this._showSummaryBoxPointer();
         } else if (this._summaryBoxPointerState == State.SHOWN) {
-            if (!haveClickedSummaryItem || !canShowSummaryBoxPointer || wrongSummaryBoxPointer || !hasNotifications) {
+            if (!haveClickedSummaryItem || wrongSummaryBoxPointer || !hasNotifications) {
                 this._hideSummaryBoxPointer();
                 if (wrongSummaryBoxPointer)
                     this._showSummaryBoxPointer();